More stuff, comments and fixes