Updated Script, Fixed Bugs