improved readme, plus some minor re-naming