Various fixes. Should run now?