Some sorta bug fixes. I want to have a diff of this and this is this is the easiest way to get one.