merge stuff in the readme