Tweaked unit properties and removed extraneous and commented debugging statements