several improvements towards first alpha