doing some fixes after testing