Comments and better Date handling