tiny optimization and more stats