Big cleanup, balanced stuff - this is kinda fun. lol