Minor code changes; changed comments and added question