fixed issues marked on th 2nd review