put back normalization + fixes