made fixes elz suggested