Removed warnings, Improved Components