Finnished Last fixes Hopefully