another bugfix
some minor changes & reorganization