Updated Small Bugs