did some minor changes