many fixes

you can has fixes