cleanup/bugfixes