more stuff moved to glug, cleanup of bad practices, less work in diff mode