worked on trying to get merg working, also cleaned a bunch of stuff up