bug 1137: added date check and fixed some typos