Introduced Language enum and other minor fixes.