added some more to the standard setup