fixed stuff
working on it