Fixes & more translations