merge iss62/iss63 branches into develop

also deleted old, dead comments from splatfilch main