I cleaned some stuff up, And made things work better! ^-^