fixing jumping bugs, still buggy