Add more modifications and improve README