Some smaller corrections (also fixing date bug)