First improvements over fixed version

See "First improvements"