change ugly 'x'
Merge branch 'more-improvements'