fixing tidy issues + getting `make` to work