Typos, code cleanup, event deletion and icon creation