merged time slot and other minor fixes