Fix line rendering on Firefox / Chrome

Also continue work on punctuation (commented out for now)