Advancing on XBMC import and some bug fixes