A few updates

See commits for details