updated various parts