some findbugs errors are fixed 2