Took a bunch of updates from robyrussel's plugin folder