checked/edited some parts