another bounch of bugfix