Corrected timestamp function

Removed the conversion to universal time (which may have been part the problem) and also cleaned it up a bit (there was no need for two separate functions, the way I see it :)

Try it now and see if it works. I checked the rest of the code, but couldn't find anything else that might apparently be wrong.