fixes to keep up with develop
Forgot some files, merge and tweak towards develop branch