Fixed more tab completion bugs and nick changes