Some fixes to follow lisp coding conventions and typo fixes.