corrected unit name
unscoping block names and adding labels to objects (which are off)