Fix import error message
Change several comments