update

modified some classes/function names and added methods.