Some minor changes, not sure if everything is pushed