namespace usage cleanup
header cleanup
some preliminary prep for next release