Day 4: Add score and wave properties, clean up some variable nomenclature