cleanup
minor fixes
check for invalid _set_block calls temporarily
Merge branch 'master' into app