Some performance improvements using JProfiler.