more fixes.. still more must be done