more stats, fixes