fixed couple of minor issues