quick cleanup; issues still unresolved