formatting + fixes