Added basic connections
Minor tweaks