Some minor cleanup, added critical path analysis.