resolved some warnings, fixed spelling