code block fixes
more tweaks
Merge branch 'develop'