fix some thinking mistakes