improve logs, increase timeout

cleaner log messages, added logging when timeout occurs