Final changes

See commits