improve doc and fix some findbugs issues