a fiew more fixes
a fiew more fixes