added icons, tightened up some stuff.