tweak waits for faster loading