Added stuff
added some public crap
and more