some fixes after clean up