pushing up a lot of bug fixes for the connection mappings'