some small fixes after testing