Comments

Just some comments and misc changes