Commit before doing some destructive work
Several minor changes