Fix more stuff and better errors