Refactoring, Closure inheritance (Viewer), Bug fixes.