Removed vocabulary bug and improved the viewer class and its features