Fixed up tray icon and other miscellaneous issues