Keystro improvements