Assorted cleanup and navigation fixing