Numerous bug fixes
A few minor enhancements off of the BR list.