adding scriptlets and more refined options