Tidy variable names, fix couple of bugs
Change to minutes not seconds and set defaults