Tweaks and changes. Code enhanced.