fixed issue starting service too soon (before we have creds)
added refresh icons
stream updates
removed dead code
added some TODO stuff