Improving info messages. Fixing small bug.