bug fixes, repo by collection function

fixed a conflict

and made the builders much less ugly

more lexicons, some fixes to axum stuff

version bump the second