fixed shorthand funcs, misc