Enhanced non-string types, updated READMEs, and various cleanups
Clean-up a bit