Many more funcs, bug fixes, enhancements