more changes and bugfixes
fixes