more fixes
Changes...