Some error handling, and sped up intervals