Added TabCompleters and minor refactoring.