Added in an accessor as well as made various fixes March 16, 2013