A lot of cleanup, modded voting and routes