Increase timeout, fix sub zapd, make see all more robust