Misc changes and added translate