Improve plugin install/loading consistency, misc cleanup and prep