small changes & comments from others