- few minor changes made to fix couple of bugs that were detected during testing