No block: end for single expression, use of ";" and end, misc improvements