Fix up some stuff, add better_errors