up + fixes