Minor tweaks and fixes.

Need to do a lot of work to this library.