some navigation stuff fixed on ch. 1