some fixes from some feedback