fixed everything, need to add statistics and better keywords