fixed warnings and messages.