Change README header
Some bug fixes