Separable and non-separable multi-field inflation and large non-Gaussianity