Add Guide button support (thanks benblo), and various fixes.