more cleanup. fixing outputs. fixing logic.