Added more shorteners
Keyword additions and optimizations — 20140604