Minor fixes in setup
Function output modified