Fixed timeslot as well as some minor localization issues