fixing shit lood of bugs