not much done, some functions now depend on Nt and N etc.