Misc improvements, temporarily disabled failing test (work in progress).