#92
#97, some fixes and #migrations