Refined languages support and fix smaller bugs