few improvements and bugfixes
forgotten stuff