lot of bugfix