more language fixes and cleanup