Database almost finished, need some fixing