Fixes, adjustments & plugin updates