fixes, simplification, block commenting
control blocks are now considered when calculating html indentation