strings added
Bugs fixed