logo and some quick clean up