fixed some nfw werid things