Take out pointless comments, add buffer navigation.