bugfixes and vs2013 prjs