Some comments and some fixes and things