More spec, minor fixes
Merge pull request #1 from HornsAndHooves/339_minor_fixes

More spec, minor fixes