Added/revised comments, minor bug fixes