Added some stuff
Fixed some bugs