improved doc and shortcuts