added isTimestamp and bug fixes