minor changes & bugfixes