tweaks
refactored the sh*t out of the componentsManager