Minior fixes. Improve serializer performance. Swap timestamp fields for date.