add connections and some little form fix