cleanup, GSG part1, guide display improvements