Adding class name into scope
Clearing error messages
Many fixes in method/function calls.