Bug Fix and More Addon.d Support! Still No Remover Yet!