Improved the time parsing (better performance and added weeks)