More modes, minor fixes