Overall Cleanup start
*Config crash fixed
*Commenting here and there