logo and some fixes