converted more stuff to keywords
helpful little list of funcs