Some fixes but not much progress...