improoved language display and bug protection