fix part of bugs i can see before getting better marked