some comments and a bit moving around of stuff