- some minor changes and cleanup. Disable some failing tests.