some fixings and db change