Added TODO for Divij and fixed casing in error messages.