Opening day is less than two weeks away, and whether Gunnar Henderson will be playing shortstop and leading off for the Orioles is the biggest question facing the ballclub as spring training begins to wind down.

Henderson said Saturday that his right intercostal feels "a lot better," and he's hoping to be available for Opening Day, Jake Rill of MLB.com reports. The 23-year-old suffered the mild intercostal strain in late February but resumed baseball activities this week and is hoping to return to game action before the end of the Grapefruit League slate.