Merged some ATV things, Thanks to OpenATV #2