added lots of stuff, fixed some stuff, broke even more stuff.