fix some things from Sebastian's comments