Assorted Improvements

Assorted Improvements