Improve readme, specs and minor fixes