some bug fixes and minor output text change