Fixed timers, added optimizations to edges order

see email sent about this same time