#16 minor changes
#16 added a few new kinds of request