ok so fixed some things