minor file changes after git branch bs (master is screwed)