logos and some fixes