Lots of stuff from visionmedias fork