resolved lot of warnings