General Improvements

New Icon, some bugs fixed