Updating readme, minor code fixes.