Changes made as per feedback from sevansoft

Have implemented some of the changes suggested by sevansoft.