alpha version (few fixes)