[Main] Fixed Bugs...