updates

Changes the name of some functions and added comments