Updating readme and a few variable names