merge fixes and flashing icon fix

fixed problem with the icon flashing to noconnectionicon

also merge fixes