Added createdAt. Misc improves & fixes