added stuff
fixed bugs
fixed merge conflicts