Lots of changes

See change log in sketch.