improvement/bugfixes