Changes incorporated

Reviewed files and changes incorporated