2013_07_11 bugfixes