Legit fixed the times problem and fixed the time db as it was broken

Go beat the first level in times then try to play it again right away.
Then fix that problem because I can't find it anywhere.
Merge branch 'duncan'
conflicts resolved
fixed conflicts for real