fixes #16
fixes #23,
fixes #24
fixes #22
fixes #21
closes #19
closes #14
ordering migration