Added more output and better input handling