Additional statistics & clean up