fixed some parts