fixed warnings, fixed comment