reverted some caffeine commits to back before this mess began, but kept commit 529 (fixed Ctrl-C bug)