fixed some timing issues; removed some crud