updated last parts before starting on more..