Fixed some stuff
merging