Updated Comments, Fixed some warnings.