minor fixes
purge contiguous analysis into branch