Little tweaks and improvements
Implemented component strings