Cleanup; misc changes