Improved language stuffs, still broken