add more features, some stolen from Ubuntu