Update to latest

Numerus fixes and improvements