Added random number reneration when file not found + minor beauty changes