fixed layout; also fixed timestamp differences