[UPDATE] fix ups and such