further developments.
bugfixes
little oops.
small change