tweak connections, add manually organized map