Update ReadMe, clean code a bit, revisit some bugs