Bugs Fixed, OI Updates, Code Organization, Winch