logo and minor fixies