Bugs fixed
Files added