small changes fixes