schema changes, fixes #14