Overall coupling enlightened. Fixes #91, Improves #16