fixing stuff
merging