fix errors to actually work
merge and fix human name