Bug fixes & Output changes