many cosmetic changes as per edisonout's suggestions