small fixes after testing