Minor comment changes + some scheme mode stuff.