fixed timestamp and some minor errors