Bug fixes and added connection formatting features