Minor Bugs arranged