more cleanup, bug fix, more translations