minor changes; quick commit before branching