OS X icon, and many small fixes