app icon, code cleanup, bug fixes