More bug fixes, working on app icon