Lots of little stuff changed Haven't commited in a while