Bug fixes; work on new connecting system