changed some smal stuffs