more fixes to help