fixed some minor/major routing issues with charlie