fixed some issues. Getting there.. working on flatness.