Fix more documentation
Add the mapping extension!