Fixed mode setup and updated selection collision.