Still upgrading to excon-less style, minor changes (debug, tests)