more separation and fixes