Updated comments, readme, and tests