Fixed Bugs, Handle Connections