new timing structure + cleaned

began testing on safari as well