Fix typo
Cleanup
modernize build
BDep tweak, since this isn't my package.