fixing all the minor issues