Fixed minor issues and string file