Improved controls
Added automatic connection retries