many minor fixes
Merge branch 'master' of https://github.com/iinnovations/cupidweblib
Merge edits. No good reason except poor planning.