removed ?, fixed formatting glitches