Element parameters managed by directors
Code cleanup
Fixes