minor bug fixed, renamed functions in modules, closing up on version 2.1