Fixed polling
Added more licenses (such evil)