Fixed ant build script, a merge issue, and the time-left indicator.