Add misc plugin management * Misc cleanup