Several more bug fixes with latest revisions.

I think I've cleared up most of the problems that were occurring in the latest releases.
File an issue if you see additional problems!