done some fixes from the reviews