Multiple Changes

See commits.