Codechanges2

code changes enhancements and minor fixes