fixed deadlines

This is based on our email thread and Brent's suggestions.