Added some stuff
edit
Fixed some errors