some cleanup, added icon