Fix winchbackcommand

also cleaned up a couple other things