General tidy up & support media item id's in readiness for issue #5