complete event and button docs
fix merge conflict