general cleanup, including separated dao layer, latest wix.js, etc