The last commit really fixed #1 but oh well.  This will close it.