added some type icons, fixed some bugs, still lots of stuff to do