Cleaned up stuff, worked on string formatting
Fixed database mismatch