updated several parts