Updated ReadME and some function names