Add comments, change empty string to integer, change count to variable count