added some time estimates and removed all trailing whitespace