Add controls over 2 new fields
Fix on amendment validity
v0.0.6