Some bug fixes

Among them, made the proper word appear when orientation changes.