small bug fixes
Merge branch 'master' of https://github.com/nathancrandall/cecilia
Merge branch 'master' of https://github.com/nathancrandall/cecilia