work on icons, added bugs!