Correcting some syntax oddities. I should probably go to sleep.