fixed some stuff at last second!