still haunted by the git badness; important properties now corrected