cleaned a bunch of stuff up, fixed some makefiles