misc. updates requested for the past PR