Modified readme and fix bugs