Added the beginning of a menu. ALso a couple of smaller changes in places, but nothing significant.