Updating readme, and fixing a few things based on that