Bugs fixed done