Fixed some bugs and updated icon