Bug fixes & added extra print info