working on commenting and connect bug
merged from server