Shotengai 10: v1.16

Minor bug fixes