Add backtraces, fix errors, etc