several changes from the past three months

Signed-off-by: Prasanna Santhanam <tsp@apache.org>