Added warning. Minor improvements.