Prepping for README.md integration, other tweaks