some fixes
fixes for fixes