Small Fixes

Gate order ; default focuspoints