Consolidated and streamlined things.
Minor changes to readme, etc.