Minor Bugs Fixed

ELEVATED

Some minor bugs fixed.