finished database diagram plus misc changes