fixed some lag issues