Minor changes + global automatization