fixed formatting issues, reintroduced gantt chart conflict.  Too bad, I'm done