Added more functions, some untested. Noted in #pragmas