Added more key words and printing to command line