improved schema
several bugfixes
further bugfixes
further bugfixes