Some small changes from feedback