fixes and timestamp based on locale - v1.5.1