Added Kodi's changes to mine, added some more commands in worker