fix some stuff
merging