Bugs Fixed

Bugs Fixed by initial author Spavid04