misc. changes and additions