logo and various other fixes