Points over time + better out of bounds checking