add composer possibility
small code embellishments