Bug fixes and updates

It has been quite a while since a commit has been pushed to the
repository, so this is a slew of bug fixes and minor updates.