little changes

New class "TrashCanTypeGenerator" and other changes.