-added space var to master -fixed error state -general formatting