Updated comments; needs better validation on MAC