Added a few expositions (self and selected_unit)