Updated comments, Fixed bug in equals