added icon, fixed issues