Some more things have been done. Fixed localization also.