Improvements

Finally got around to re-doing this PR with only the bugfix and README addition.