fix a little parts