Add more terms to corpus; fix resulting bugs