Added more info in terminal output and fixed small bug