Many Good Changes

Haven't commited in a while.