fixed some more stuff form studio review