Bugs fixed, README improved