working on some fixes yo