fix some parts