fix class method auto-complete
simplify jsp and fix bug
merging newest change