fixes, simplification, block commenting