some small fix & db