Added comments, etc.