Logo & minor cleanup