More minor changes (comments and such)