Minor changes
Bugs killed