fix some small parts