Code improvements and minor Updates.