implemented all text
fixing merge conflicts... again.