modifications and bug-fixing; updated readme