Fixed some bugs
Added some exception handling
Handled a corner case
Added go to construct