added some more keywords and shortenName function/tests