fixes and things