Revert "various cleanups, comments; NOTE: broken at the moment"

This reverts commit 90428f4aacc7b97be71b9f533e312ec51ea71524.