Fixes name bug and wrong comments