version bump and updates based on AMO review