Mixed commits

lmk if you want me to split them up in different pull requests