Moar logos! some other improvements