A couple more bug fixes; getting closer...