Where Is Granma!?: Update March 18

Bug fixes