adding some dependencies, minor modifications to elements