Improved PWD; added timestamps