adjust timeouts/deadlines
better logging
refactoring