Final Bugs fixed