final changes before alpha 1.1