More polish to the 1-D case, fixes to the 4-D case