Some bug fixes with what I just implemented