some housekeeping

Some minor changes and comments.