Source code update - Messages

Added some warning messages, minor tweaks