change minor things(suppresswarning, override..)