adds nicer tree. normalizes context expansion