corrupted options can be identified inside every block type now
end of options is added if there are already options present
minor output fixes