Route system + minor "fixes"