Minor Bugs Complete