small fixes and schema sql updated