Housekeeping

Comments, bug fixes, etc.