Multiple Changes

I should have been committing this whole time..