Database completed + fixed a few bugs...