Updates and bug fixes

more accurate and new warning label added. Currently latest working
version.