again more fixes....