Revision 5.7

Added a shotgun, cleaned up some code.