a fiew more fixes