some more text rearranging and unifying