Minor fixes

Changed timeout and waiting times, also minor fixes