Fixed Errors/ Database Done.... I think :p