make_cia 6.2

Bug fixes + sanity checks