more separation and bugfixes