Final Version Bugs Fixed