some minor fixing