small mods
Merge branch 'devbranch'