fixed some things broke something