Optimax optimizations

https://github.com/poondog/kangaroo-m7-mkIV/commit/143d53c9a558babfef27f2a1047cdc61dd848c07
https://github.com/poondog/kangaroo-m7-mkIV/commit/1128a673ddbc56d885e28523d08050effa033b9e