Some fix and some strings added