fixed some things maybe probably