Fixes, cleanup and translation