Made question marks more obvious
Fixed some bugs with new headers