making some fixes