A few new things - hope it commits correctly
Fixed most things with plugin.