changed the fields to private but forgot to change equals method. clean
up a bit too.
Merge remote-tracking branch 'origin/master'