fixes and specs running cleanly