Added new funcs, bug fixes