larger update in preparation of beta version