terms and more
changes various