Fix CME in PM handler and skipping after index shifts. QOL improvements.