AutoConnect now works with manual connection assignments

Plus a few other little bug fixes