README and some code improvements