Language improvements

Language improvements gosh…