Update 4

Lots of changes, see readme.