Cleaneed up some changes in logic and help