Fixes and removal of debug print statements
Adding updates