fix somes bugs