Simplification and bugfixes in typos.