updated readme and various bug fix