diff --git a/llm/gguf.go b/llm/gguf.go
index c5bb6756d..09ad2a182 100644
--- a/llm/gguf.go
+++ b/llm/gguf.go
@@ -141,11 +141,13 @@ func (llm *gguf) numKV() uint64 {
 
 func (llm *gguf) Decode(rs io.ReadSeeker) error {
 	// decode key-values
+	fmt.Println(llm.numKV())
 	for i := 0; uint64(i) < llm.numKV(); i++ {
 		k, err := readGGUFString(llm, rs)
 		if err != nil {
 			return err
 		}
+		fmt.Printf("k: %#v\n", k)
 
 		t, err := readGGUF[uint32](llm, rs)
 		if err != nil {
@@ -204,13 +206,15 @@ func (llm *gguf) Decode(rs io.ReadSeeker) error {
 			return fmt.Errorf("failed to read tensor dimensions: %w", err)
 		}
 
-		shape := [4]uint64{1, 1, 1, 1}
+		shape := []uint64{}
 		for i := 0; uint32(i) < dims; i++ {
-			shape[i], err = readGGUF[uint64](llm, rs)
+			shapeVal, err := readGGUF[uint64](llm, rs)
 			if err != nil {
 				return fmt.Errorf("failed to read tensor shape: %w", err)
 			}
+			shape = append(shape, shapeVal)
 		}
+		fmt.Println("tensor ", name, " shape ", shape)
 
 		kind, err := readGGUF[uint32](llm, rs)
 		if err != nil {
@@ -226,7 +230,7 @@ func (llm *gguf) Decode(rs io.ReadSeeker) error {
 			Name:   name,
 			Kind:   kind,
 			Offset: offset,
-			Shape:  shape[:],
+			Shape:  shape,
 		}
 
 		llm.tensors = append(llm.tensors, &tensor)
@@ -742,7 +746,7 @@ func (gguf GGUFWriter) WriteTo(w io.Writer) (int64, error) {
 		return 0, err
 	}
 
-	if err := binary.Write(wo, binary.LittleEndian, uint64(len(gguf.KV))); err != nil {
+	if err := binary.Write(wo, binary.LittleEndian, uint64(len(gguf.KV)-1)); err != nil {
 		return 0, err
 	}
 
@@ -793,6 +797,7 @@ func ggufWriteTensorInfo(ws io.Writer, t *Tensor) error {
 	if err := binary.Write(ws, binary.LittleEndian, uint32(len(t.Shape))); err != nil {
 		return err
 	}
+	fmt.Println("tensor ", t.Name, " shape ", t.Shape)
 
 	for i := range len(t.Shape) {
 		if err := binary.Write(ws, binary.LittleEndian, t.Shape[len(t.Shape)-i-1]); err != nil {
diff --git a/server/model.go b/server/model.go
index 55702b371..769f532c2 100644
--- a/server/model.go
+++ b/server/model.go
@@ -248,10 +248,15 @@ func parseFromFile(ctx context.Context, file *os.File, digest string, fn func(ap
 			var tensors llm.Tensors
 
 			for _, tensor := range ggml.Tensors() {
+				shape := make([]uint64, len(tensor.Shape))
+				for i := range len(tensor.Shape) {
+					shape[i] = tensor.Shape[len(tensor.Shape)-i-1]
+				}
+
 				tensors = append(tensors, &llm.Tensor{
 					Name:  tensor.Name,
 					Kind:  tensor.Kind,
-					Shape: tensor.Shape,
+					Shape: shape,
 
 					WriterTo: &llm.TensorWriter{
 						Reader: io.NewSectionReader(file, int64(tensor.Offset), int64(tensor.Size())),