Updated Main/ Removed Bugs