many fixes and such