Use NumberFormatException instead of Exception
Remove extra param
Update dates and links and things