'slight' changes + block parser fix
current test cases
merged from rollback, restored state before last parser rewrite