misc cleanup
Merge origin/prolog1 into prolog1