Fixed Bugs with Previous Version of Some Scripts