Bunch of changes I haven't commited in awhile