Added warning notification and few fixes.