Minor bug fixes; speed up by \'local brute-force\'