Fixed #1, fixed #2, added icon and basic info