+ cleanup
+ added config change attributes.