renamed some methods and improved a warning message.