fixed some delays and some visibility problems for test purposes