Removed most warnings. Ready for date implementation