some cleanup; added help