[patch] more optimizations and cleanup

[Jon Scott Stevens]

Found a couple optimizations (such as not calling System.currentTimeMillis()
unless debug is on...

Cleaned up the code

-jon

changes2.diff
Description: Binary data