Global fixes: typo, bugs and description