more fixes
fixing things