added icons. fixed a few bugs