Fixing Bugs and final problems