interim commit on the path to 3-D consistency. bugs in display and state computation! 1-D still works fine...