Cleaned up equals() and hashCode(), per code review
finalize variables and optimize imports
Merge branch 'subquery' into 0.6.57-n3twork