[SCHEMA UPDATE] many fixes