lots of formatting fixes, condition for no upcoming trips