more fixes
 and more fixes