Minor fixes and console logs added