A couple of bug fixes.
Removing print() line.
Adding some 1D stuff.
Fix conflicts.