Added Comments, updated limit