Fixed some stuff
merged