Create another few packet types, and do some general cleanup. See diff