A few correction to the previous changes made with regard to un hard
coding various aspects.