fixing stuff
stashing