fixed brokenness; hopefully mergeable now