small changes, comments and such