misc updates
cleanup