customer fix + gui additions and improvements