Addressed all of the above issues in 289bf30.  Thanks!