Bug fixes

Removing reserved words and some code formatting errors.  Also fixing
the bug in adopt pet function.