Finalised database, changed some formatting