More in the README and some clean up in the code.