Updated times, fixed ealier mistakes
Merge pull request #31 from JDrit/master

I'll assume this is correct. As far as I know, you're gonna have to find someone to push this live, it isn't automated or anything.