finalized changes, removed uneeded code, awaiting inspection