Made some improvements, I think that does it for now