Changed a lot

 - compute_next is now a function with nested functions to handle minutes
   and hours
 - hours section for commas is now parsed