more annoy Rikai commits

forgot some stuff. likely broken.