6.17.20140719.14

fixed: more bugfixes