Changing icon and fixing bugs.