Fixed i.e.
Other minor fixes