minor changes to stuffs