fixed bugs, added icon