some minor fixes after testing