misc. cleanup and additions