More minor Changes

Made some minor changes