Updated menu, minor debug additions