updated base config and cleanup