revamp controller configuration -- fixes #1 and fixes #3