OneClick Part Start and small bug fix