some fixes iii