Stuff

Stuff that didnt get committed last time, and added to fix commentaries