Small changes

ULP™ suggested few changes. still need to double check if they are correct.