Final Bugs Fixed