Removed ALOT of warnings!!!!!!!!!!!!!!!!