bugfix
Various major changes