Removing some errors

@DarkGuardsman heh we're still stepping on each other's toes but don't worry... I'll happily fix all merge conflicts :)