Fixing things, more changes to come