in a 'Beta' version, few fixes and comments