fixes and helpers
minor