little improvement + correction in db diagram