some fixes after testing