Saturday Evening Updates

Changed some comments and fixed some method names based on John’s
remarks.