some fixes after reading