Lots of changes inc term removal