NoScope added, some error fixes