Mass Bugs fixed