bugfixes and sutff