Update: cleanup, refactor for rpgzero in progress