rework done, fixes from review done