added a nice pattern for default in the generator. changed terminology a bit.