Basic FASA bug/continuity fixes
NovaPunch2 Work (WIP)