Minor bug fixes, tweaked selected flight handling