Overall coupling enlightened. Fixes #93, Improves #16