Did a Code Pro audit. pelynch

Fairly straightforward. Biggest change is in fixing the equals method. pelynch