Fixed: typos, extended