some fixes to things