cleanup; fixes