Improved regexes
Improved time regex
Improved caldate var and removed some console.logs