some fixes after basic review