fixed stuff
fixed merge
refactor