Some small changes. More to come