Improve docs and incorporate @fishcakez feedback