Improve some commands relative to XBMC