2013-04-09 minor changes, commiting before switching branches