2013_07_03, cleanup
2013-07-03, bugfixes