FIXED a couple of minor issues