Removing some debug stuff
Fixed some stuff