2013-06-03 clean-up
2013-06-07, bugfixes