Fixed it all up.. should be fine