fixed more bugs from findbugs