WIP: minor improvements #397

Draft
wykwit wants to merge 7 commits from wykwit/abra:minor-improvements into main

7 Commits