more progress and fixups