more cleanup; missing edit capability